display: Remove gdk_display_get_last_seen_time()

Replace the only usage - in the X11 backend - with an X11-specific call.

diff --git a/gdk/broadway/gdkbroadway-server.c b/gdk/broadway/gdkbroadway-server.c
index 23207916dbbf6eec25e1c6bce1d248054ccdf5b7..6e235e1b528ed0b19349c4d0cec60ee90ea5d9d9 100644 (file)
--- a/gdk/broadway/gdkbroadway-server.c
+++ b/gdk/broadway/gdkbroadway-server.c
@@ -160,12 +160,6 @@ _gdk_broadway_server_new (GdkDisplay *display,
   return server;
 }
 
-guint32
-_gdk_broadway_server_get_last_seen_time (GdkBroadwayServer *server)
-{
-  return 0;
-}
-
 static guint32
 gdk_broadway_server_send_message_with_size (GdkBroadwayServer *server, BroadwayRequestBase *base,
                                             gsize size, guint32 type, int fd)

diff --git a/gdk/broadway/gdkbroadway-server.h b/gdk/broadway/gdkbroadway-server.h
index e04d90f9b59b9b007b44dd51f188ca793a87713f..8bdcbb45c11d39ad502c995ffc1df7c7d0ed7283 100644 (file)
--- a/gdk/broadway/gdkbroadway-server.h
+++ b/gdk/broadway/gdkbroadway-server.h
@@ -24,7 +24,6 @@ void               _gdk_broadway_server_roundtrip                (GdkBroadwaySer
                                                                   gint32            id,
                                                                   guint32           tag);
 gulong             _gdk_broadway_server_get_next_serial          (GdkBroadwayServer  *server);
-guint32            _gdk_broadway_server_get_last_seen_time       (GdkBroadwayServer  *server);
 gboolean           _gdk_broadway_server_lookahead_event          (GdkBroadwayServer  *server,
                                                                  const char         *types);
 void               _gdk_broadway_server_query_mouse              (GdkBroadwayServer  *server,

diff --git a/gdk/broadway/gdkbroadwaysurface.h b/gdk/broadway/gdkbroadwaysurface.h
index d05bf2627f448472718531d565e3bd97eb3899e2..0e937d0a8d82239b023e1ee0ae244257484d78c6 100644 (file)
--- a/gdk/broadway/gdkbroadwaysurface.h
+++ b/gdk/broadway/gdkbroadwaysurface.h
@@ -46,9 +46,6 @@ typedef struct _GdkBroadwaySurfaceClass GdkBroadwaySurfaceClass;
 GDK_AVAILABLE_IN_ALL
 GType    gdk_broadway_surface_get_type          (void);
 
-GDK_AVAILABLE_IN_ALL
-guint32  gdk_broadway_get_last_seen_time (GdkSurface       *surface);
-
 G_END_DECLS
 
 #endif /* __GDK_BROADWAY_SURFACE_H__ */

diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c
index db7428719f2dbd39af99252be7d2a4dbb8db580b..0a507dc3ae83127a4f70c8df70ab5ddc5dcf1a05 100644 (file)
--- a/gdk/broadway/gdkdisplay-broadway.c
+++ b/gdk/broadway/gdkdisplay-broadway.c
@@ -340,12 +340,6 @@ gdk_broadway_display_get_setting (GdkDisplay *display,
   return FALSE;
 }
 
-static guint32
-gdk_broadway_display_get_last_seen_time (GdkDisplay *display)
-{
-  return _gdk_broadway_server_get_last_seen_time (GDK_BROADWAY_DISPLAY (display)->server);
-}
-
 typedef struct {
   int id;
   GdkDisplay *display;
@@ -437,5 +431,4 @@ gdk_broadway_display_class_init (GdkBroadwayDisplayClass * class)
   display_class->get_n_monitors = gdk_broadway_display_get_n_monitors;
   display_class->get_monitor = gdk_broadway_display_get_monitor;
   display_class->get_setting = gdk_broadway_display_get_setting;
-  display_class->get_last_seen_time = gdk_broadway_display_get_last_seen_time;
 }

diff --git a/gdk/broadway/gdksurface-broadway.c b/gdk/broadway/gdksurface-broadway.c
index 68927415cdad611da27da43be0324cbb3fd3b259..64ae49ccafaae0f28686f4e088c02f88e1e4b3f7 100644 (file)
--- a/gdk/broadway/gdksurface-broadway.c
+++ b/gdk/broadway/gdksurface-broadway.c
@@ -1282,15 +1282,6 @@ gdk_broadway_surface_beep (GdkSurface *surface)
   return FALSE;
 }
 
-guint32
-gdk_broadway_get_last_seen_time (GdkSurface  *surface)
-{
-  GdkDisplay *display;
-
-  display = gdk_surface_get_display (surface);
-  return _gdk_broadway_server_get_last_seen_time (GDK_BROADWAY_DISPLAY (display)->server);
-}
-
 static void
 gdk_broadway_surface_class_init (GdkBroadwaySurfaceClass *klass)
 {

diff --git a/gdk/gdk-private.h b/gdk/gdk-private.h
index 5a8d2fe657473f0ae055b374f21e64af2cb883db..eadf47a7ab48098a978f0319195ff10115e0fc35 100644 (file)
--- a/gdk/gdk-private.h
+++ b/gdk/gdk-private.h
@@ -18,7 +18,7 @@ void            gdk_pre_parse                   (void);
 void            gdk_surface_freeze_toplevel_updates      (GdkSurface *surface);
 void            gdk_surface_thaw_toplevel_updates        (GdkSurface *surface);
 
-guint32         gdk_display_get_last_seen_time  (GdkDisplay *display);
+gboolean        gdk_surface_supports_edge_constraints    (GdkSurface *surface);
 
 void gdk_display_set_double_click_time     (GdkDisplay   *display,
                                             guint         msec);

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 9274ca13188dc1b07d35820acd0fff7de8dc5887..88e5057e65900bc15b2ed9bb576d472b3ba8582a 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -1678,17 +1678,6 @@ gdk_display_setting_changed (GdkDisplay       *display,
   g_signal_emit (display, signals[SETTING_CHANGED], 0, name);
 }
 
-guint32
-gdk_display_get_last_seen_time (GdkDisplay *display)
-{
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), GDK_CURRENT_TIME);
-
-  if (GDK_DISPLAY_GET_CLASS (display)->get_last_seen_time)
-    return GDK_DISPLAY_GET_CLASS (display)->get_last_seen_time (display);
-
-  return GDK_CURRENT_TIME;
-}
-
 void
 gdk_display_set_double_click_time (GdkDisplay *display,
                                    guint       msec)

diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index 433f699f40ab58e87495ce8425dad771196ef96c..9ac0dd39326dcb5cc3353fa5cfa68c0da1e344b9 100644 (file)
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -164,7 +164,6 @@ struct _GdkDisplayClass
   gboolean               (*get_setting)                (GdkDisplay     *display,
                                                         const char     *name,
                                                         GValue         *value);
-  guint32                (*get_last_seen_time)         (GdkDisplay     *display);
   void                   (*set_cursor_theme)           (GdkDisplay     *display,
                                                         const char     *name,
                                                         int             size);

diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index ffda794ec76cf3e8788c7b6b2769e874eb957a7a..ec451426b0447481cd994268d2b4281b88960e77 100644 (file)
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -1083,12 +1083,6 @@ gdk_win32_display_get_setting (GdkDisplay  *display,
   return _gdk_win32_get_setting (name, value);
 }
 
-static guint32
-gdk_win32_display_get_last_seen_time (GdkDisplay *display)
-{
-  return GetMessageTime ();
-}
-
 static void
 gdk_win32_display_class_init (GdkWin32DisplayClass *klass)
 {
@@ -1129,7 +1123,6 @@ gdk_win32_display_class_init (GdkWin32DisplayClass *klass)
 #endif
 
   display_class->get_setting = gdk_win32_display_get_setting;
-  display_class->get_last_seen_time = gdk_win32_display_get_last_seen_time;
   display_class->set_cursor_theme = gdk_win32_display_set_cursor_theme;
 
   _gdk_win32_surfaceing_init ();

diff --git a/gdk/x11/gdkclipboard-x11.c b/gdk/x11/gdkclipboard-x11.c
index 743ad52c6203c28142561f6466f09341381307ab..aae2d1216a07c40c68a5696c166620adc5f4910c 100644 (file)
--- a/gdk/x11/gdkclipboard-x11.c
+++ b/gdk/x11/gdkclipboard-x11.c
@@ -544,7 +544,7 @@ gdk_x11_clipboard_claim (GdkClipboard       *clipboard,
       Window xwindow = GDK_X11_DISPLAY (display)->leader_window;
       guint32 time;
 
-      time = gdk_display_get_last_seen_time (display);
+      time = gdk_x11_get_server_time (GDK_X11_DISPLAY (display)->leader_gdk_surface);
 
       if (content)
         {

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index ee129b80867e00458db075e7a0e58c26ce8cd1d6..6f90f0de78a9230d40e0a7e3899a5ebd8bdec742 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -2975,12 +2975,6 @@ gdk_x11_display_get_toplevel_windows (GdkDisplay *display)
   return GDK_X11_DISPLAY (display)->toplevels;
 }
 
-static guint32
-gdk_x11_display_get_last_seen_time (GdkDisplay *display)
-{
-  return gdk_x11_get_server_time (GDK_X11_DISPLAY (display)->leader_gdk_surface);
-}
-
 static gboolean
 gdk_boolean_handled_accumulator (GSignalInvocationHint *ihint,
                                  GValue                *return_accu,
@@ -3037,7 +3031,6 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
   display_class->get_n_monitors = gdk_x11_display_get_n_monitors;
   display_class->get_monitor = gdk_x11_display_get_monitor;
   display_class->get_setting = gdk_x11_display_get_setting;
-  display_class->get_last_seen_time = gdk_x11_display_get_last_seen_time;
   display_class->set_cursor_theme = gdk_x11_display_set_cursor_theme;
 
   class->xevent = gdk_event_source_xevent;

diff --git a/gdk/x11/gdkdrag-x11.c b/gdk/x11/gdkdrag-x11.c
index 3ae250c9657e5ae40a377ceb65a8c4d4435ed25d..a23c2159a959356067ea0c4866f2cefc5da44baf 100644 (file)
--- a/gdk/x11/gdkdrag-x11.c
+++ b/gdk/x11/gdkdrag-x11.c
@@ -2040,7 +2040,7 @@ _gdk_x11_surface_drag_begin (GdkSurface         *surface,
  
   move_drag_surface (drag, x_root, y_root);
 
-  x11_drag->timestamp = gdk_display_get_last_seen_time (display);
+  x11_drag->timestamp = gdk_x11_get_server_time (GDK_X11_DISPLAY (display)->leader_gdk_surface);
   xselection = gdk_x11_get_xatom_by_name_for_display (display, "XdndSelection");
   XSetSelectionOwner (GDK_DISPLAY_XDISPLAY (display),
                       xselection,